Fix AMP integration by deferring masterbar setup to wp action #11088
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for the great PR description! When this PR is ready for review, please apply the Scheduled Jetpack release: January 10, 2019. |
jeherve
added
[Type] Bug
jeherve
reviewed
Jan 7, 2019
jeherve
added
[Status] Needs Author Reply
…t in wp-admin Co-Authored-By: westonruter <westonruter@google.com>
I think the reason is that in the admin, the |
jeherve
removed
the
[Status] Needs Author Reply
Yep, that's what was happening. Thanks for digging into it! |
jeherve
added
the
[Status] Ready to Merge
jeherve
approved these changes
Jan 7, 2019
|
Should this be assigned to me now? I can't merge it 😄 |
|
No worries :) Someone else will come around, review and merge :) |
ghost
removed
[Status] Needs Changelog
[Status] Ready to Merge
|
Cherry-picked to |
jeherve
pushed a commit
that referenced
this pull request
Jan 8, 2019
<!--- Provide a general summary of your changes in the Title above --> Fixes #11082 Fixes #11081 #### Changes proposed in this Pull Request: * Defer masterbar setup until the `wp` action, instead of doing the setup at the `init` action. This is needed because the `is_amp_endpoint()` function cannot be called before the `wp` action, as it needs access to the queried object. #### Testing instructions: <!-- Please include detailed testing steps, explaining how to test your change. --> <!-- Bear in mind that context you working on is not obvious for everyone. --> <!-- Adding "simple" configuration steps will help reviewers to get to your PR as quickly as possible. --> <!-- "Before / After" screenshots can also be very helpful when the change is visual. --> 1. Ensure Jetpack's masterbar module is active. 2. Activate the AMP plugin v1.0.1 3. Enable the new paired mode via the AMP settings. 4. Navigate to a singular post. Without the changes in this PR, there should be two PHP notices being raised: ``` ( ! ) Notice: Trying to get property 'post_type' of non-object in .../amp/includes/class-amp-post-type-support.php on line 80 ( ! ) Notice: Trying to get property 'ID' of non-object in .../amp/includes/class-amp-post-type-support.php on line 101 ``` See also ampproject/amp-wp#1794 which will catch the incorrect usage of `is_amp_endpoint()`. #### Proposed changelog entry for your changes: <!-- Please do not leave this empty. If no changelog entry needed, state as such. --> * Fix AMP integration with masterbar module.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #11082
Fixes #11081
Changes proposed in this Pull Request:
wpaction, instead of doing the setup at theinitaction. This is needed because theis_amp_endpoint()function cannot be called before thewpaction, as it needs access to the queried object.Testing instructions:
Without the changes in this PR, there should be two PHP notices being raised:
See also ampproject/amp-wp#1794 which will catch the incorrect usage of
is_amp_endpoint().Proposed changelog entry for your changes: